Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 16 Apr 2011 22:30:01 +0000 (15:30 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 16 Apr 2011 22:30:01 +0000 (15:30 -0700)
commit1c48bc22043a87741a1633c41ad6a16c9dd6e2ed
tree75ccbfd069fcdbfee0fba2715caedaf9e6039a3a
parent7be52ea6cf35802b43259d7a1cc10906525e91de
parent2e69151c8907fa2bed7a4edbdf5787d03d3109cb
Merge from mainline.
src/ChangeLog